Rename gtkprintbackend.h to gtkprintbackendprivate.h

Follow the naming convention for private headers.

diff --git a/gtk/gtkcustompaperunixdialog.c b/gtk/gtkcustompaperunixdialog.c
index a2d4cf64693f85a526aeb0b1c6c4dce2580b11ca..a607d417c8d7ad0b2e4574e954c450d10c422f22 100644 (file)
--- a/gtk/gtkcustompaperunixdialog.c
+++ b/gtk/gtkcustompaperunixdialog.c
@@ -35,7 +35,7 @@
 #include "gtkspinbutton.h"
 
 #include "gtkcustompaperunixdialog.h"
-#include "gtkprintbackend.h"
+#include "gtkprintbackendprivate.h"
 #include "gtkprintutils.h"
 #include "gtkdialogprivate.h"
 

diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c
index 4dce1cd7e77388f4b85cb09db2709b873f378796..2006c0d8627a3d811b54b541fc78b7e9b63a0b1e 100644 (file)
--- a/gtk/gtkmain.c
+++ b/gtk/gtkmain.c
@@ -129,7 +129,7 @@
 #include "gtkwidgetprivate.h"
 #include "gtkwindowprivate.h"
 #include "gtkwindowgroup.h"
-#include "gtkprintbackend.h"
+#include "gtkprintbackendprivate.h"
 #include "gtkimmodule.h"
 #include "gtkroot.h"
 

diff --git a/gtk/gtkpagesetupunixdialog.c b/gtk/gtkpagesetupunixdialog.c
index 7c5655c7c719eba252efa81332a3d2a9b120eed9..030b5a9b4b7519c8daf9aaa9a4dfb157ef091983 100644 (file)
--- a/gtk/gtkpagesetupunixdialog.c
+++ b/gtk/gtkpagesetupunixdialog.c
@@ -40,7 +40,7 @@
 
 #include "gtkpagesetupunixdialog.h"
 #include "gtkcustompaperunixdialog.h"
-#include "gtkprintbackend.h"
+#include "gtkprintbackendprivate.h"
 #include "gtkpapersize.h"
 #include "gtkprintutils.h"
 #include "gtkdialogprivate.h"

diff --git a/gtk/gtkprintbackend.c b/gtk/gtkprintbackend.c
index 33c419228a914ac9b9fa784d2801844d6edd6610..94efc688b4a1f179ee5aaada3c7e78736bc258f9 100644 (file)
--- a/gtk/gtkprintbackend.c
+++ b/gtk/gtkprintbackend.c
@@ -1,5 +1,5 @@
 /* GTK - The GIMP Toolkit
- * gtkprintbackend.h: Abstract printer backend interfaces
+ * gtkprintbackendprivate.h: Abstract printer backend interfaces
  * Copyright (C) 2003, Red Hat, Inc.
  *
  * This library is free software; you can redistribute it and/or
@@ -26,7 +26,7 @@
 #include "gtkmodulesprivate.h"
 #include "gtkmarshalers.h"
 #include "gtkprivate.h"
-#include "gtkprintbackend.h"
+#include "gtkprintbackendprivate.h"
 
 
 static void gtk_print_backend_dispose      (GObject      *object);

diff --git a/gtk/gtkprintbackend.h b/gtk/gtkprintbackend.h
deleted file mode 100644 (file)
index 2b4718e..0000000
--- a/gtk/gtkprintbackend.h
+++ /dev/null
@@ -1,238 +0,0 @@
-/* GTK - The GIMP Toolkit
- * gtkprintbackend.h: Abstract printer backend interfaces
- * Copyright (C) 2006, Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef __GTK_PRINT_BACKEND_H__
-#define __GTK_PRINT_BACKEND_H__
-
-/* This is a "semi-private" header; it is meant only for
- * alternate GtkPrintDialog backend modules; no stability guarantees
- * are made at this point
- */
-#ifndef GTK_PRINT_BACKEND_ENABLE_UNSUPPORTED
-#error "GtkPrintBackend is not supported API for general use"
-#endif
-
-#include <gtk/gtk.h>
-#include <gtk/gtkunixprint.h>
-#include <gtk/gtkprinteroptionset.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GtkPrintBackendClass    GtkPrintBackendClass;
-typedef struct _GtkPrintBackendPrivate  GtkPrintBackendPrivate;
-
-#define GTK_PRINT_BACKEND_ERROR (gtk_print_backend_error_quark ())
-
-typedef enum
-{
-  /* TODO: add specific errors */
-  GTK_PRINT_BACKEND_ERROR_GENERIC
-} GtkPrintBackendError;
-
-GDK_AVAILABLE_IN_ALL
-GQuark     gtk_print_backend_error_quark      (void);
-
-#define GTK_TYPE_PRINT_BACKEND                  (gtk_print_backend_get_type ())
-#define GTK_PRINT_BACKEND(obj)                  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_PRINT_BACKEND, GtkPrintBackend))
-#define GTK_PRINT_BACKEND_CLASS(klass)          (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_PRINT_BACKEND, GtkPrintBackendClass))
-#define GTK_IS_PRINT_BACKEND(obj)               (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_PRINT_BACKEND))
-#define GTK_IS_PRINT_BACKEND_CLASS(klass)       (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_PRINT_BACKEND))
-#define GTK_PRINT_BACKEND_GET_CLASS(obj)        (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_PRINT_BACKEND, GtkPrintBackendClass))
-
-typedef enum 
-{
-  GTK_PRINT_BACKEND_STATUS_UNKNOWN,
-  GTK_PRINT_BACKEND_STATUS_OK,
-  GTK_PRINT_BACKEND_STATUS_UNAVAILABLE
-} GtkPrintBackendStatus;
-
-struct _GtkPrintBackend
-{
-  GObject parent_instance;
-
-  GtkPrintBackendPrivate *priv;
-};
-
-struct _GtkPrintBackendClass
-{
-  GObjectClass parent_class;
-
-  /* Global backend methods: */
-  void                   (*request_printer_list)            (GtkPrintBackend        *backend);
-  void                   (*print_stream)                    (GtkPrintBackend        *backend,
-                                                            GtkPrintJob            *job,
-                                                            GIOChannel             *data_io,
-                                                            GtkPrintJobCompleteFunc callback,
-                                                            gpointer                user_data,
-                                                            GDestroyNotify          dnotify);
-
-  /* Printer methods: */
-  void                  (*printer_request_details)           (GtkPrinter          *printer);
-  cairo_surface_t *     (*printer_create_cairo_surface)      (GtkPrinter          *printer,
-                                                             GtkPrintSettings    *settings,
-                                                             gdouble              height,
-                                                             gdouble              width,
-                                                             GIOChannel          *cache_io);
-  GtkPrinterOptionSet * (*printer_get_options)               (GtkPrinter          *printer,
-                                                             GtkPrintSettings    *settings,
-                                                             GtkPageSetup        *page_setup,
-                                                             GtkPrintCapabilities capabilities);
-  gboolean              (*printer_mark_conflicts)            (GtkPrinter          *printer,
-                                                             GtkPrinterOptionSet *options);
-  void                  (*printer_get_settings_from_options) (GtkPrinter          *printer,
-                                                             GtkPrinterOptionSet *options,
-                                                             GtkPrintSettings    *settings);
-  void                  (*printer_prepare_for_print)         (GtkPrinter          *printer,
-                                                             GtkPrintJob         *print_job,
-                                                             GtkPrintSettings    *settings,
-                                                             GtkPageSetup        *page_setup);
-  GList  *              (*printer_list_papers)               (GtkPrinter          *printer);
-  GtkPageSetup *        (*printer_get_default_page_size)     (GtkPrinter          *printer);
-  gboolean              (*printer_get_hard_margins)          (GtkPrinter          *printer,
-                                                             gdouble             *top,
-                                                             gdouble             *bottom,
-                                                             gdouble             *left,
-                                                             gdouble             *right);
-  GtkPrintCapabilities  (*printer_get_capabilities)          (GtkPrinter          *printer);
-
-  /* Signals */
-  void                  (*printer_list_changed)              (GtkPrintBackend     *backend);
-  void                  (*printer_list_done)                 (GtkPrintBackend     *backend);
-  void                  (*printer_added)                     (GtkPrintBackend     *backend,
-                                                             GtkPrinter          *printer);
-  void                  (*printer_removed)                   (GtkPrintBackend     *backend,
-                                                             GtkPrinter          *printer);
-  void                  (*printer_status_changed)            (GtkPrintBackend     *backend,
-                                                             GtkPrinter          *printer);
-  void                  (*request_password)                  (GtkPrintBackend     *backend,
-                                                              gpointer             auth_info_required,
-                                                              gpointer             auth_info_default,
-                                                              gpointer             auth_info_display,
-                                                              gpointer             auth_info_visible,
-                                                              const gchar         *prompt,
-                                                              gboolean             can_store_auth_info);
-
-  /* not a signal */
-  void                  (*set_password)                      (GtkPrintBackend     *backend,
-                                                              gchar              **auth_info_required,
-                                                              gchar              **auth_info,
-                                                              gboolean             store_auth_info);
-
-  gboolean              (*printer_get_hard_margins_for_paper_size) (GtkPrinter    *printer,
-                                                                   GtkPaperSize  *paper_size,
-                                                                   gdouble       *top,
-                                                                   gdouble       *bottom,
-                                                                   gdouble       *left,
-                                                                   gdouble       *right);
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-};
-
-#define GTK_PRINT_BACKEND_EXTENSION_POINT_NAME "gtk-print-backend"
-
-GDK_AVAILABLE_IN_ALL
-GType   gtk_print_backend_get_type       (void) G_GNUC_CONST;
-
-GDK_AVAILABLE_IN_ALL
-GList      *gtk_print_backend_get_printer_list     (GtkPrintBackend         *print_backend);
-GDK_AVAILABLE_IN_ALL
-gboolean    gtk_print_backend_printer_list_is_done (GtkPrintBackend         *print_backend);
-GDK_AVAILABLE_IN_ALL
-GtkPrinter *gtk_print_backend_find_printer         (GtkPrintBackend         *print_backend,
-                                                   const gchar             *printer_name);
-GDK_AVAILABLE_IN_ALL
-void        gtk_print_backend_print_stream         (GtkPrintBackend         *print_backend,
-                                                   GtkPrintJob             *job,
-                                                   GIOChannel              *data_io,
-                                                   GtkPrintJobCompleteFunc  callback,
-                                                   gpointer                 user_data,
-                                                   GDestroyNotify           dnotify);
-GDK_AVAILABLE_IN_ALL
-GList *     gtk_print_backend_load_modules         (void);
-GDK_AVAILABLE_IN_ALL
-void        gtk_print_backend_destroy              (GtkPrintBackend         *print_backend);
-GDK_AVAILABLE_IN_ALL
-void        gtk_print_backend_set_password         (GtkPrintBackend         *backend, 
-                                                    gchar                  **auth_info_required,
-                                                    gchar                  **auth_info,
-                                                    gboolean                 can_store_auth_info);
-
-/* Backend-only functions for GtkPrintBackend */
-
-GDK_AVAILABLE_IN_ALL
-void        gtk_print_backend_add_printer          (GtkPrintBackend         *print_backend,
-                                                   GtkPrinter              *printer);
-GDK_AVAILABLE_IN_ALL
-void        gtk_print_backend_remove_printer       (GtkPrintBackend         *print_backend,
-                                                   GtkPrinter              *printer);
-GDK_AVAILABLE_IN_ALL
-void        gtk_print_backend_set_list_done        (GtkPrintBackend         *backend);
-
-
-/* Backend-only functions for GtkPrinter */
-GDK_AVAILABLE_IN_ALL
-gboolean    gtk_printer_is_new                (GtkPrinter      *printer);
-GDK_AVAILABLE_IN_ALL
-void        gtk_printer_set_accepts_pdf       (GtkPrinter      *printer,
-                                              gboolean         val);
-GDK_AVAILABLE_IN_ALL
-void        gtk_printer_set_accepts_ps        (GtkPrinter      *printer,
-                                              gboolean         val);
-GDK_AVAILABLE_IN_ALL
-void        gtk_printer_set_is_new            (GtkPrinter      *printer,
-                                              gboolean         val);
-GDK_AVAILABLE_IN_ALL
-void        gtk_printer_set_is_active         (GtkPrinter      *printer,
-                                              gboolean         val);
-GDK_AVAILABLE_IN_ALL
-gboolean    gtk_printer_set_is_paused         (GtkPrinter      *printer,
-                                              gboolean         val);
-GDK_AVAILABLE_IN_ALL
-gboolean    gtk_printer_set_is_accepting_jobs (GtkPrinter      *printer,
-                                              gboolean         val);
-GDK_AVAILABLE_IN_ALL
-void        gtk_printer_set_has_details       (GtkPrinter      *printer,
-                                              gboolean         val);
-GDK_AVAILABLE_IN_ALL
-void        gtk_printer_set_is_default        (GtkPrinter      *printer,
-                                              gboolean         val);
-GDK_AVAILABLE_IN_ALL
-void        gtk_printer_set_icon_name         (GtkPrinter      *printer,
-                                              const gchar     *icon);
-GDK_AVAILABLE_IN_ALL
-gboolean    gtk_printer_set_job_count         (GtkPrinter      *printer,
-                                              gint             count);
-GDK_AVAILABLE_IN_ALL
-gboolean    gtk_printer_set_location          (GtkPrinter      *printer,
-                                              const gchar     *location);
-GDK_AVAILABLE_IN_ALL
-gboolean    gtk_printer_set_description       (GtkPrinter      *printer,
-                                              const gchar     *description);
-GDK_AVAILABLE_IN_ALL
-gboolean    gtk_printer_set_state_message     (GtkPrinter      *printer,
-                                              const gchar     *message);
-
-void        gtk_print_backends_init (void);
-
-
-G_END_DECLS
-
-#endif /* __GTK_PRINT_BACKEND_H__ */

diff --git a/gtk/gtkprintbackendprivate.h b/gtk/gtkprintbackendprivate.h
new file mode 100644 (file)
index 0000000..1c6b91e
--- /dev/null
+++ b/gtk/gtkprintbackendprivate.h
@@ -0,0 +1,233 @@
+/* GTK - The GIMP Toolkit
+ * gtkprintbackend.h: Abstract printer backend interfaces
+ * Copyright (C) 2006, Red Hat, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GTK_PRINT_BACKEND_PRIVATE_H__
+#define __GTK_PRINT_BACKEND_PRIVATE_H__
+
+/* This is a "semi-private" header; it is meant only for
+ * alternate GtkPrintDialog backend modules; no stability guarantees
+ * are made at this point
+ */
+#ifndef GTK_PRINT_BACKEND_ENABLE_UNSUPPORTED
+#error "GtkPrintBackend is not supported API for general use"
+#endif
+
+#include <gtk/gtk.h>
+#include <gtk/gtkunixprint.h>
+#include <gtk/gtkprinteroptionset.h>
+
+G_BEGIN_DECLS
+
+typedef struct _GtkPrintBackendClass    GtkPrintBackendClass;
+typedef struct _GtkPrintBackendPrivate  GtkPrintBackendPrivate;
+
+#define GTK_PRINT_BACKEND_ERROR (gtk_print_backend_error_quark ())
+
+typedef enum
+{
+  /* TODO: add specific errors */
+  GTK_PRINT_BACKEND_ERROR_GENERIC
+} GtkPrintBackendError;
+
+GDK_AVAILABLE_IN_ALL
+GQuark     gtk_print_backend_error_quark      (void);
+
+#define GTK_TYPE_PRINT_BACKEND                  (gtk_print_backend_get_type ())
+#define GTK_PRINT_BACKEND(obj)                  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_PRINT_BACKEND, GtkPrintBackend))
+#define GTK_PRINT_BACKEND_CLASS(klass)          (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_PRINT_BACKEND, GtkPrintBackendClass))
+#define GTK_IS_PRINT_BACKEND(obj)               (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_PRINT_BACKEND))
+#define GTK_IS_PRINT_BACKEND_CLASS(klass)       (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_PRINT_BACKEND))
+#define GTK_PRINT_BACKEND_GET_CLASS(obj)        (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_PRINT_BACKEND, GtkPrintBackendClass))
+
+typedef enum 
+{
+  GTK_PRINT_BACKEND_STATUS_UNKNOWN,
+  GTK_PRINT_BACKEND_STATUS_OK,
+  GTK_PRINT_BACKEND_STATUS_UNAVAILABLE
+} GtkPrintBackendStatus;
+
+struct _GtkPrintBackend
+{
+  GObject parent_instance;
+
+  GtkPrintBackendPrivate *priv;
+};
+
+struct _GtkPrintBackendClass
+{
+  GObjectClass parent_class;
+
+  /* Global backend methods: */
+  void                   (*request_printer_list)            (GtkPrintBackend        *backend);
+  void                   (*print_stream)                    (GtkPrintBackend        *backend,
+                                                            GtkPrintJob            *job,
+                                                            GIOChannel             *data_io,
+                                                            GtkPrintJobCompleteFunc callback,
+                                                            gpointer                user_data,
+                                                            GDestroyNotify          dnotify);
+
+  /* Printer methods: */
+  void                  (*printer_request_details)           (GtkPrinter          *printer);
+  cairo_surface_t *     (*printer_create_cairo_surface)      (GtkPrinter          *printer,
+                                                             GtkPrintSettings    *settings,
+                                                             gdouble              height,
+                                                             gdouble              width,
+                                                             GIOChannel          *cache_io);
+  GtkPrinterOptionSet * (*printer_get_options)               (GtkPrinter          *printer,
+                                                             GtkPrintSettings    *settings,
+                                                             GtkPageSetup        *page_setup,
+                                                             GtkPrintCapabilities capabilities);
+  gboolean              (*printer_mark_conflicts)            (GtkPrinter          *printer,
+                                                             GtkPrinterOptionSet *options);
+  void                  (*printer_get_settings_from_options) (GtkPrinter          *printer,
+                                                             GtkPrinterOptionSet *options,
+                                                             GtkPrintSettings    *settings);
+  void                  (*printer_prepare_for_print)         (GtkPrinter          *printer,
+                                                             GtkPrintJob         *print_job,
+                                                             GtkPrintSettings    *settings,
+                                                             GtkPageSetup        *page_setup);
+  GList  *              (*printer_list_papers)               (GtkPrinter          *printer);
+  GtkPageSetup *        (*printer_get_default_page_size)     (GtkPrinter          *printer);
+  gboolean              (*printer_get_hard_margins)          (GtkPrinter          *printer,
+                                                             gdouble             *top,
+                                                             gdouble             *bottom,
+                                                             gdouble             *left,
+                                                             gdouble             *right);
+  GtkPrintCapabilities  (*printer_get_capabilities)          (GtkPrinter          *printer);
+
+  /* Signals */
+  void                  (*printer_list_changed)              (GtkPrintBackend     *backend);
+  void                  (*printer_list_done)                 (GtkPrintBackend     *backend);
+  void                  (*printer_added)                     (GtkPrintBackend     *backend,
+                                                             GtkPrinter          *printer);
+  void                  (*printer_removed)                   (GtkPrintBackend     *backend,
+                                                             GtkPrinter          *printer);
+  void                  (*printer_status_changed)            (GtkPrintBackend     *backend,
+                                                             GtkPrinter          *printer);
+  void                  (*request_password)                  (GtkPrintBackend     *backend,
+                                                              gpointer             auth_info_required,
+                                                              gpointer             auth_info_default,
+                                                              gpointer             auth_info_display,
+                                                              gpointer             auth_info_visible,
+                                                              const gchar         *prompt,
+                                                              gboolean             can_store_auth_info);
+
+  /* not a signal */
+  void                  (*set_password)                      (GtkPrintBackend     *backend,
+                                                              gchar              **auth_info_required,
+                                                              gchar              **auth_info,
+                                                              gboolean             store_auth_info);
+
+  gboolean              (*printer_get_hard_margins_for_paper_size) (GtkPrinter    *printer,
+                                                                   GtkPaperSize  *paper_size,
+                                                                   gdouble       *top,
+                                                                   gdouble       *bottom,
+                                                                   gdouble       *left,
+                                                                   gdouble       *right);
+};
+
+#define GTK_PRINT_BACKEND_EXTENSION_POINT_NAME "gtk-print-backend"
+
+GDK_AVAILABLE_IN_ALL
+GType   gtk_print_backend_get_type       (void) G_GNUC_CONST;
+
+GDK_AVAILABLE_IN_ALL
+GList      *gtk_print_backend_get_printer_list     (GtkPrintBackend         *print_backend);
+GDK_AVAILABLE_IN_ALL
+gboolean    gtk_print_backend_printer_list_is_done (GtkPrintBackend         *print_backend);
+GDK_AVAILABLE_IN_ALL
+GtkPrinter *gtk_print_backend_find_printer         (GtkPrintBackend         *print_backend,
+                                                   const gchar             *printer_name);
+GDK_AVAILABLE_IN_ALL
+void        gtk_print_backend_print_stream         (GtkPrintBackend         *print_backend,
+                                                   GtkPrintJob             *job,
+                                                   GIOChannel              *data_io,
+                                                   GtkPrintJobCompleteFunc  callback,
+                                                   gpointer                 user_data,
+                                                   GDestroyNotify           dnotify);
+GDK_AVAILABLE_IN_ALL
+GList *     gtk_print_backend_load_modules         (void);
+GDK_AVAILABLE_IN_ALL
+void        gtk_print_backend_destroy              (GtkPrintBackend         *print_backend);
+GDK_AVAILABLE_IN_ALL
+void        gtk_print_backend_set_password         (GtkPrintBackend         *backend, 
+                                                    gchar                  **auth_info_required,
+                                                    gchar                  **auth_info,
+                                                    gboolean                 can_store_auth_info);
+
+/* Backend-only functions for GtkPrintBackend */
+
+GDK_AVAILABLE_IN_ALL
+void        gtk_print_backend_add_printer          (GtkPrintBackend         *print_backend,
+                                                   GtkPrinter              *printer);
+GDK_AVAILABLE_IN_ALL
+void        gtk_print_backend_remove_printer       (GtkPrintBackend         *print_backend,
+                                                   GtkPrinter              *printer);
+GDK_AVAILABLE_IN_ALL
+void        gtk_print_backend_set_list_done        (GtkPrintBackend         *backend);
+
+
+/* Backend-only functions for GtkPrinter */
+GDK_AVAILABLE_IN_ALL
+gboolean    gtk_printer_is_new                (GtkPrinter      *printer);
+GDK_AVAILABLE_IN_ALL
+void        gtk_printer_set_accepts_pdf       (GtkPrinter      *printer,
+                                              gboolean         val);
+GDK_AVAILABLE_IN_ALL
+void        gtk_printer_set_accepts_ps        (GtkPrinter      *printer,
+                                              gboolean         val);
+GDK_AVAILABLE_IN_ALL
+void        gtk_printer_set_is_new            (GtkPrinter      *printer,
+                                              gboolean         val);
+GDK_AVAILABLE_IN_ALL
+void        gtk_printer_set_is_active         (GtkPrinter      *printer,
+                                              gboolean         val);
+GDK_AVAILABLE_IN_ALL
+gboolean    gtk_printer_set_is_paused         (GtkPrinter      *printer,
+                                              gboolean         val);
+GDK_AVAILABLE_IN_ALL
+gboolean    gtk_printer_set_is_accepting_jobs (GtkPrinter      *printer,
+                                              gboolean         val);
+GDK_AVAILABLE_IN_ALL
+void        gtk_printer_set_has_details       (GtkPrinter      *printer,
+                                              gboolean         val);
+GDK_AVAILABLE_IN_ALL
+void        gtk_printer_set_is_default        (GtkPrinter      *printer,
+                                              gboolean         val);
+GDK_AVAILABLE_IN_ALL
+void        gtk_printer_set_icon_name         (GtkPrinter      *printer,
+                                              const gchar     *icon);
+GDK_AVAILABLE_IN_ALL
+gboolean    gtk_printer_set_job_count         (GtkPrinter      *printer,
+                                              gint             count);
+GDK_AVAILABLE_IN_ALL
+gboolean    gtk_printer_set_location          (GtkPrinter      *printer,
+                                              const gchar     *location);
+GDK_AVAILABLE_IN_ALL
+gboolean    gtk_printer_set_description       (GtkPrinter      *printer,
+                                              const gchar     *description);
+GDK_AVAILABLE_IN_ALL
+gboolean    gtk_printer_set_state_message     (GtkPrinter      *printer,
+                                              const gchar     *message);
+
+void        gtk_print_backends_init (void);
+
+
+G_END_DECLS
+
+#endif /* __GTK_PRINT_BACKEND_PRIVATE_H__ */

diff --git a/gtk/gtkprinter.c b/gtk/gtkprinter.c
index d7008062aff49043299d2a11298bd4ef3555f216..25c189265a8c8ede55917b288b1c1cf7da560439 100644 (file)
--- a/gtk/gtkprinter.c
+++ b/gtk/gtkprinter.c
@@ -25,7 +25,7 @@
 
 #include "gtkprinter.h"
 #include "gtkprinterprivate.h"
-#include "gtkprintbackend.h"
+#include "gtkprintbackendprivate.h"
 #include "gtkprintjob.h"
 
 /**

diff --git a/gtk/gtkprinteroptionset.c b/gtk/gtkprinteroptionset.c
index 5748565c7f0a67dc5d5ea43633abd59b853bb10c..4e6dbee4c9c9dc80ab7d00dd9a4545890b8fd4ec 100644 (file)
--- a/gtk/gtkprinteroptionset.c
+++ b/gtk/gtkprinteroptionset.c
@@ -1,5 +1,5 @@
 /* GTK - The GIMP Toolkit
- * gtkprintbackend.h: Abstract printer backend interfaces
+ * gtkprintbackendprivate.h: Abstract printer backend interfaces
  * Copyright (C) 2006, Red Hat, Inc.
  *
  * This library is free software; you can redistribute it and/or

diff --git a/gtk/gtkprintjob.c b/gtk/gtkprintjob.c
index fd5b9de4a662d608a2e1c3f6dbee6ad96e7bdb0c..80b833b0ee8d4c57d9ecb1b6d23715389d48662d 100644 (file)
--- a/gtk/gtkprintjob.c
+++ b/gtk/gtkprintjob.c
@@ -50,7 +50,7 @@
 #include "gtkprintjob.h"
 #include "gtkprinter.h"
 #include "gtkprinterprivate.h"
-#include "gtkprintbackend.h"
+#include "gtkprintbackendprivate.h"
 
 #ifndef O_BINARY
 #define O_BINARY 0

diff --git a/gtk/gtkprintoperation-portal.c b/gtk/gtkprintoperation-portal.c
index fa4a058efd01161b8a92f28b879ff738b7694228..93cb8724e2548bd69ae36c07af78faf3c2381a88 100644 (file)
--- a/gtk/gtkprintoperation-portal.c
+++ b/gtk/gtkprintoperation-portal.c
@@ -33,7 +33,7 @@
 #include "gtkprintoperation-portal.h"
 #include "gtkprintsettings.h"
 #include "gtkpagesetup.h"
-#include "gtkprintbackend.h"
+#include "gtkprintbackendprivate.h"
 #include "gtkshow.h"
 #include "gtkintl.h"
 #include "gtkwindowprivate.h"

diff --git a/gtk/gtkprintoperation-unix.c b/gtk/gtkprintoperation-unix.c
index 8e15763b67bc78314e4d02839a5c097423d0d10b..16ca75cf1bd4c48f7621a668fea36fb3176d16b4 100644 (file)
--- a/gtk/gtkprintoperation-unix.c
+++ b/gtk/gtkprintoperation-unix.c
@@ -38,7 +38,7 @@
 #include "gtkprivate.h"
 #include "gtkprintunixdialog.h"
 #include "gtkpagesetupunixdialog.h"
-#include "gtkprintbackend.h"
+#include "gtkprintbackendprivate.h"
 #include "gtkprinter.h"
 #include "gtkprintjob.h"
 #include "gtklabel.h"

diff --git a/gtk/gtkprintunixdialog.c b/gtk/gtkprintunixdialog.c
index 440c9555d418b7008ef81af29d9c40ec68f1ea94..519668665af38d166a97f9b84438661b4ec08928 100644 (file)
--- a/gtk/gtkprintunixdialog.c
+++ b/gtk/gtkprintunixdialog.c
@@ -28,7 +28,7 @@
 #include "gtkprintunixdialog.h"
 
 #include "gtkcustompaperunixdialog.h"
-#include "gtkprintbackend.h"
+#include "gtkprintbackendprivate.h"
 #include "gtkprinterprivate.h"
 #include "gtkprinteroptionwidget.h"
 #include "gtkprintutils.h"

diff --git a/modules/printbackends/gtkprintbackendcloudprint.c b/modules/printbackends/gtkprintbackendcloudprint.c
index 964fc750457db78ecc84459a834d1db3998475cb..6a5d7755afb32743ea682a4ea7270c0dc1ca631b 100644 (file)
--- a/modules/printbackends/gtkprintbackendcloudprint.c
+++ b/modules/printbackends/gtkprintbackendcloudprint.c
@@ -32,7 +32,7 @@
 
 #include <glib/gi18n-lib.h>
 
-#include <gtk/gtkprintbackend.h>
+#include <gtk/gtkprintbackendprivate.h>
 #include <gtk/gtkunixprint.h>
 #include <gtk/gtkprinterprivate.h>
 

diff --git a/modules/printbackends/gtkprintbackendcloudprint.h b/modules/printbackends/gtkprintbackendcloudprint.h
index 044ad4b32b356aa33c07d2cc18637659f396539c..ca7f5e0005b44ac70308030fb82e9119d26741cd 100644 (file)
--- a/modules/printbackends/gtkprintbackendcloudprint.h
+++ b/modules/printbackends/gtkprintbackendcloudprint.h
@@ -20,7 +20,7 @@
 #define __GTK_PRINT_BACKEND_CLOUDPRINT_H__
 
 #include <glib-object.h>
-#include "gtkprintbackend.h"
+#include "gtkprintbackendprivate.h"
 
 G_BEGIN_DECLS
 

diff --git a/modules/printbackends/gtkprintbackendcups.c b/modules/printbackends/gtkprintbackendcups.c
index 739318821aab36a79ace77ab97e22c8aa1e9eafe..87cf6d3ce364865ba326fba1a4c4629cf7af590c 100644 (file)
--- a/modules/printbackends/gtkprintbackendcups.c
+++ b/modules/printbackends/gtkprintbackendcups.c
@@ -45,7 +45,7 @@
 #include <gmodule.h>
 
 #include <gtk/gtk.h>
-#include <gtk/gtkprintbackend.h>
+#include <gtk/gtkprintbackendprivate.h>
 #include <gtk/gtkunixprint.h>
 #include <gtk/gtkprinterprivate.h>
 

diff --git a/modules/printbackends/gtkprintbackendcups.h b/modules/printbackends/gtkprintbackendcups.h
index d4e35ddf23d8edbc025ad2c417d45043ffc232c5..a37a571a35d7560e501bb7169b1e417e7d9317f1 100644 (file)
--- a/modules/printbackends/gtkprintbackendcups.h
+++ b/modules/printbackends/gtkprintbackendcups.h
@@ -20,7 +20,7 @@
 #define __GTK_PRINT_BACKEND_CUPS_H__
 
 #include <glib-object.h>
-#include "gtkprintbackend.h"
+#include "gtkprintbackendprivate.h"
 
 G_BEGIN_DECLS
 

diff --git a/modules/printbackends/gtkprintbackendfile.h b/modules/printbackends/gtkprintbackendfile.h
index b4ae41a15c6203226c29a65b2916c1ed66a00b1e..0ca051b5ffff385963811cd99824f77968b8c5f2 100644 (file)
--- a/modules/printbackends/gtkprintbackendfile.h
+++ b/modules/printbackends/gtkprintbackendfile.h
@@ -21,7 +21,7 @@
 #define __GTK_PRINT_BACKEND_FILE_H__
 
 #include <glib-object.h>
-#include "gtkprintbackend.h"
+#include "gtkprintbackendprivate.h"
 
 G_BEGIN_DECLS
 

diff --git a/modules/printbackends/gtkprintbackendlpr.h b/modules/printbackends/gtkprintbackendlpr.h
index 0ba195bebd6d2e8ebd28b8707bda6c67f7a9a07c..ea8c849521ee7431d65280df3a158dc277799d8d 100644 (file)
--- a/modules/printbackends/gtkprintbackendlpr.h
+++ b/modules/printbackends/gtkprintbackendlpr.h
@@ -21,7 +21,7 @@
 #define __GTK_PRINT_BACKEND_LPR_H__
 
 #include <glib-object.h>
-#include "gtkprintbackend.h"
+#include "gtkprintbackendprivate.h"
 
 G_BEGIN_DECLS